Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Jul 2012 04:56:32 +0000 (21:56 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Jul 2012 04:56:32 +0000 (21:56 -0700)
commit8d35e1add16e3737e90570dc0c018e45d6036f1d
tree0dee62e29254e5b6512ed8392610e958775af102
parenteee882a206c0dbc267b620faa4829f00826f0090
parente1a26c442cb00c018609e64601a1b866621f2561
Merge from trunk.